From 3b782bdb944ce5b8697844b6dedbc8b5ea0f444a Mon Sep 17 00:00:00 2001 From: Alex Larsson Date: Fri, 4 May 2001 21:41:17 +0000 Subject: [PATCH] Better error messages. 2001-05-04 Alex Larsson * gdk/linux-fb/gdkcolor-fb.c: Better error messages. * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new): Initialize abs_x and abs_y. * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic): Correct handling of stipple offset. * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): Treat directcolor framebuffers as truecolor. --- ChangeLog | 14 ++++++++++++++ ChangeLog.pre-2-0 | 14 ++++++++++++++ ChangeLog.pre-2-10 | 14 ++++++++++++++ ChangeLog.pre-2-2 | 14 ++++++++++++++ ChangeLog.pre-2-4 | 14 ++++++++++++++ ChangeLog.pre-2-6 | 14 ++++++++++++++ ChangeLog.pre-2-8 | 14 ++++++++++++++ gdk/linux-fb/gdkcolor-fb.c | 4 ++-- gdk/linux-fb/gdkpixmap-fb.c | 4 ++++ gdk/linux-fb/gdkrender-fb.c | 4 ++-- gdk/linux-fb/gdkvisual-fb.c | 8 ++++---- 11 files changed, 110 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28cd6d631a..e74f7a3629 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2001-05-04 Alex Larsson + + * gdk/linux-fb/gdkcolor-fb.c: + Better error messages. + + * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new): + Initialize abs_x and abs_y. + + * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic): + Correct handling of stipple offset. + + * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): + Treat directcolor framebuffers as truecolor. + Thu May 3 14:13:49 2001 Owen Taylor * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 28cd6d631a..e74f7a3629 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,17 @@ +2001-05-04 Alex Larsson + + * gdk/linux-fb/gdkcolor-fb.c: + Better error messages. + + * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new): + Initialize abs_x and abs_y. + + * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic): + Correct handling of stipple offset. + + * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): + Treat directcolor framebuffers as truecolor. + Thu May 3 14:13:49 2001 Owen Taylor * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 28cd6d631a..e74f7a3629 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +2001-05-04 Alex Larsson + + * gdk/linux-fb/gdkcolor-fb.c: + Better error messages. + + * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new): + Initialize abs_x and abs_y. + + * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic): + Correct handling of stipple offset. + + * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): + Treat directcolor framebuffers as truecolor. + Thu May 3 14:13:49 2001 Owen Taylor * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 28cd6d631a..e74f7a3629 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,17 @@ +2001-05-04 Alex Larsson + + * gdk/linux-fb/gdkcolor-fb.c: + Better error messages. + + * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new): + Initialize abs_x and abs_y. + + * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic): + Correct handling of stipple offset. + + * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): + Treat directcolor framebuffers as truecolor. + Thu May 3 14:13:49 2001 Owen Taylor * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 28cd6d631a..e74f7a3629 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +2001-05-04 Alex Larsson + + * gdk/linux-fb/gdkcolor-fb.c: + Better error messages. + + * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new): + Initialize abs_x and abs_y. + + * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic): + Correct handling of stipple offset. + + * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): + Treat directcolor framebuffers as truecolor. + Thu May 3 14:13:49 2001 Owen Taylor * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 28cd6d631a..e74f7a3629 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +2001-05-04 Alex Larsson + + * gdk/linux-fb/gdkcolor-fb.c: + Better error messages. + + * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new): + Initialize abs_x and abs_y. + + * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic): + Correct handling of stipple offset. + + * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): + Treat directcolor framebuffers as truecolor. + Thu May 3 14:13:49 2001 Owen Taylor * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 28cd6d631a..e74f7a3629 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +2001-05-04 Alex Larsson + + * gdk/linux-fb/gdkcolor-fb.c: + Better error messages. + + * gdk/linux-fb/gdkpixmap-fb.c (gdk_pixmap_new): + Initialize abs_x and abs_y. + + * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic): + Correct handling of stipple offset. + + * gdk/linux-fb/gdkvisual-fb.c (gdk_visual_init): + Treat directcolor framebuffers as truecolor. + Thu May 3 14:13:49 2001 Owen Taylor * INSTALL.in HACKING gtk/gtkaccessible.[ch] gtk/gtk.c: Add diff --git a/gdk/linux-fb/gdkcolor-fb.c b/gdk/linux-fb/gdkcolor-fb.c index 702c2d1e7c..e720058ca6 100644 --- a/gdk/linux-fb/gdkcolor-fb.c +++ b/gdk/linux-fb/gdkcolor-fb.c @@ -171,7 +171,7 @@ gdk_colormap_new (GdkVisual *visual, break; case GDK_VISUAL_DIRECT_COLOR: - g_error("NYI"); + g_warning ("gdk_colormap_new () on a direct color visual not implemented"); #if 0 colormap->colors = g_new (GdkColor, colormap->size); @@ -289,7 +289,7 @@ gdk_colormap_get_system (void) } break; case GDK_VISUAL_DIRECT_COLOR: - g_error("NYI"); + g_warning ("gdk_colormap_get_system() on a direct color visual is not implemented"); break; default: g_assert_not_reached (); diff --git a/gdk/linux-fb/gdkpixmap-fb.c b/gdk/linux-fb/gdkpixmap-fb.c index 4b9d3e4651..a0dbcdb2f3 100644 --- a/gdk/linux-fb/gdkpixmap-fb.c +++ b/gdk/linux-fb/gdkpixmap-fb.c @@ -134,6 +134,10 @@ gdk_pixmap_new (GdkWindow *window, private = GDK_DRAWABLE_IMPL_FBDATA (pixmap); private->rowstride = (width * depth + 7) / 8; /* Round up to nearest whole byte */ private->mem = g_malloc (private->rowstride * height); + private->abs_x = 0; + private->abs_y = 0; + private->llim_x = 0; + private->llim_y = 0; private->lim_x = width; private->lim_y = height; private->width = width; diff --git a/gdk/linux-fb/gdkrender-fb.c b/gdk/linux-fb/gdkrender-fb.c index 2d4c1c68fe..20a4844f2d 100644 --- a/gdk/linux-fb/gdkrender-fb.c +++ b/gdk/linux-fb/gdkrender-fb.c @@ -420,8 +420,8 @@ gdk_fb_fill_span_generic (GdkDrawable *drawable, gc_private->values.stipple) { ts = gc_private->values.stipple; - tsxoff = GDK_DRAWABLE_FBDATA (ts)->abs_x - gc_private->values.ts_x_origin - private->abs_x; - tsyoff = GDK_DRAWABLE_FBDATA (ts)->abs_y - gc_private->values.ts_y_origin - private->abs_y; + tsxoff = - GDK_DRAWABLE_IMPL_FBDATA (ts)->abs_x - gc_private->values.ts_x_origin - private->abs_x; + tsyoff = - GDK_DRAWABLE_IMPL_FBDATA (ts)->abs_y - gc_private->values.ts_y_origin - private->abs_y; solid_stipple = (gc_private->values.fill == GDK_OPAQUE_STIPPLED); } diff --git a/gdk/linux-fb/gdkvisual-fb.c b/gdk/linux-fb/gdkvisual-fb.c index ea410e0358..4ac5d3c82d 100644 --- a/gdk/linux-fb/gdkvisual-fb.c +++ b/gdk/linux-fb/gdkvisual-fb.c @@ -46,12 +46,12 @@ gdk_visual_init (void) system_visual->type = GDK_VISUAL_PSEUDO_COLOR; break; case FB_VISUAL_DIRECTCOLOR: - system_visual->colormap_size = 1 << gdk_display->modeinfo.bits_per_pixel; - system_visual->type = GDK_VISUAL_DIRECT_COLOR; + /* TODO: Should load the colormap to ramps here, as they might be initialized to + some other garbage */ + /* Fall through */ case FB_VISUAL_TRUECOLOR: - if (gdk_display->sinfo.visual == FB_VISUAL_TRUECOLOR) - system_visual->type = GDK_VISUAL_TRUE_COLOR; + system_visual->type = GDK_VISUAL_TRUE_COLOR; system_visual->red_prec = gdk_display->modeinfo.red.length; system_visual->red_shift = gdk_display->modeinfo.red.offset; -- 2.30.2